[libc++] Remove obsolete Solaris and Newlib support for locales #113721
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The solaris header file doesn't even exist, so that's definitely dead code. The newlib header is empty, which means that localization can't work on that platform. If someone is using libc++ with Newlib, they must be providing LIBCXX_HAS_NO_LOCALIZATION today for anything to work, so that header is basically dead code as well.
llvmbot
added
the
libc++
Member
|
@llvm/pr-subscribers-libcxx Author: Louis Dionne (ldionne) ChangesThe solaris header file doesn't even exist, so that's definitely dead code. The newlib header is empty, which means that localization can't work on that platform. If someone is using libc++ with Newlib, they must be providing LIBCXX_HAS_NO_LOCALIZATION today for anything to work, so that header is basically dead code as well. Full diff: https://github.com/llvm/llvm-project/pull/113721.diff 4 Files Affected:
diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index 63aa74e09bb1a2..506ed721d0843e 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -497,7 +497,6 @@ set(files
__locale_dir/locale_base_api/fuchsia.h
__locale_dir/locale_base_api/ibm.h
__locale_dir/locale_base_api/musl.h
- __locale_dir/locale_base_api/newlib.h
__locale_dir/locale_base_api/openbsd.h
__locale_dir/locale_base_api/win32.h
__locale_dir/locale_guard.h
diff --git a/libcxx/include/__locale_dir/locale_base_api.h b/libcxx/include/__locale_dir/locale_base_api.h
index 8c000c558c5279..eab7fa8bf62fae 100644
--- a/libcxx/include/__locale_dir/locale_base_api.h
+++ b/libcxx/include/__locale_dir/locale_base_api.h
@@ -15,10 +15,6 @@
# include <__locale_dir/locale_base_api/ibm.h>
#elif defined(__ANDROID__)
# include <__locale_dir/locale_base_api/android.h>
-#elif defined(__sun__)
-# include <__locale_dir/locale_base_api/solaris.h>
-#elif defined(_NEWLIB_VERSION)
-# include <__locale_dir/locale_base_api/newlib.h>
#elif defined(__OpenBSD__)
# include <__locale_dir/locale_base_api/openbsd.h>
#elif defined(__Fuchsia__)
diff --git a/libcxx/include/__locale_dir/locale_base_api/newlib.h b/libcxx/include/__locale_dir/locale_base_api/newlib.h
deleted file mode 100644
index 7da10e5889843d..00000000000000
--- a/libcxx/include/__locale_dir/locale_base_api/newlib.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_NEWLIB_H
-#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_NEWLIB_H
-
-#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_NEWLIB_H
diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index c79070c318759d..f92e8bf5fc9aba 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -1451,7 +1451,6 @@ module std [system] {
textual header "__locale_dir/locale_base_api/fuchsia.h"
textual header "__locale_dir/locale_base_api/ibm.h"
textual header "__locale_dir/locale_base_api/musl.h"
- textual header "__locale_dir/locale_base_api/newlib.h"
textual header "__locale_dir/locale_base_api/openbsd.h"
textual header "__locale_dir/locale_base_api/win32.h"
}
|
winner245
pushed a commit
to winner245/llvm-project
that referenced
this pull request
Oct 26, 2024
…#113721) The solaris header file doesn't even exist, so that's definitely dead code. The newlib header is empty, which means that localization can't work on that platform. If someone is using libc++ with Newlib, they must be providing LIBCXX_HAS_NO_LOCALIZATION today for anything to work, so that header is basically dead code as well.
NoumanAmir657
pushed a commit
to NoumanAmir657/llvm-project
that referenced
this pull request
Nov 4, 2024
…#113721) The solaris header file doesn't even exist, so that's definitely dead code. The newlib header is empty, which means that localization can't work on that platform. If someone is using libc++ with Newlib, they must be providing LIBCXX_HAS_NO_LOCALIZATION today for anything to work, so that header is basically dead code as well.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The solaris header file doesn't even exist, so that's definitely dead code. The newlib header is empty, which means that localization can't work on that platform. If someone is using libc++ with Newlib, they must be providing LIBCXX_HAS_NO_LOCALIZATION today for anything to work, so that header is basically dead code as well.